From e29acab49b97bdcbae74592831994430ab861170 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 24 May 2018 14:15:32 +0100 Subject: [PATCH] x86/vmx: Simplify PAT handling during vcpu construction MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The host PAT value is a compile time constant, and doesn't need to be read out of hardware. Merge this if block into the previous block, which has an identical condition. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Kevin Tian Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/vmx/vmcs.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 258fc08f72..13b9cc5dbe 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1248,17 +1248,9 @@ static int construct_vmcs(struct vcpu *v) ept->mfn = pagetable_get_pfn(p2m_get_pagetable(p2m)); __vmwrite(EPT_POINTER, ept->eptp); - } - - if ( paging_mode_hap(d) ) - { - u64 host_pat, guest_pat; - - rdmsrl(MSR_IA32_CR_PAT, host_pat); - guest_pat = MSR_IA32_CR_PAT_RESET; - __vmwrite(HOST_PAT, host_pat); - __vmwrite(GUEST_PAT, guest_pat); + __vmwrite(HOST_PAT, XEN_MSR_PAT); + __vmwrite(GUEST_PAT, MSR_IA32_CR_PAT_RESET); } if ( cpu_has_vmx_mpx ) __vmwrite(GUEST_BNDCFGS, 0); -- 2.30.2